Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 11 Dec 2011 00:22:31 +0000 (16:22 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 11 Dec 2011 00:22:31 +0000 (16:22 -0800)

Trivial merge